Changed back from UUID

I forgot to change all the code to use UUID.