Fixed object_id usage