Switch away from using IDs in preparation for MC1.7