Simplify boot storage

I can change this to return uuid to be more consistent