Switch to Machine IDs for Freebase objects, not IDs