Can we change `make_external_id` to be unique in solitude? I'm 99% sure that we could do this on the data and it would be fine, but would have to check.