don't undefine object_id
Merge branch 'dont-undefine-object_id'