Move state machine id into its data