Fix object_id being zeroed out