Amend: Move all ID types to common/IDs.h