Fix node matching by instance-id and also fix shadowing of built-in `id`
Fix node matching by instance-id and also fix shadowing of built-in `id`

mneagul/scape-cloud-toolkit,mneagul/scape-cloud-toolkit,mneagul/scape-cloud-toolkit