Move oids out of Object into IntMap keys