Fix disambiguate_id to correctly handle UUIDs passed as strings

[M69k65y]

• Update disambiguate_id to check if result of from_global_id has a value.
• Add Fish model with explicit UUID PK field.
• Add tests to mimic UUIDs passed as a string.

[tOgg1]

Excellent, thanks!

Will release this in a patch in the coming few weeks.