Stop using object id, in preparation for federation.