[blive:rhel7/master 2/3] Refactor to use ObjectID class (#1043763)