I don't like this. I'd rather have a new map with the object number being the key. Note that in the future we may identify objects in a different way, using a name. The object reference doesn't impose the object number for instance.