Revert "Revert "Use UUIDs""

This reverts commit f728a78c655bf4b07c01be95dcdf4f5a7262bb9a.