Correcting annotation of embedded id to be @EmbeddedId