Ultimately yes, I don’t adhere to an essentialist view of identity though, identity is just a unique arrangement of matter.

Which also means that a ship-of-Theseus doesn’t maintain its identity, yes. Even more, I personally don’t think identity is anything but a consistent narrative and there’s no material identity. One doesn’t need to rearrange anything but just wait a bit and your body is no longer the body it was a second ago :)