If an entity id was created before we set the flag shuffle at the @Id annotation to true, yawp won't be able to unshuffle its id properly (because it is not shuffled).

One possible solution is to mark the entity that it has a shuffled id and only unshuffle if this mark is present.