Actually ensure that the IDs are unique