Changed every object's id to id