Revamp obj_map for just what it is used for