Good point -- The way I described it really applies to _any_ object floating in water.
I don't have much experience with ship design, but on small boat design you can rely mostly on the geometry of the boat to produce a sufficient righting moment even with a very high center of mass.
Some off-shore speedboats have really incredible self-righting because they've been designed to always have positive stability at all angles. One of my favorite videos of this in action: https://www.youtube.com/watch?v=Y2i1fOJ-itw