Added id to machine definition (was only set in the extension point)