Move node id to nodes themselves, fixex #15