Persistence needs to be based off ids

... since those are globally unique, and not likely to change.