Stop using id's, use objects as keys instead