Replace the remaining `findByPk()` calls with `findByUuid()`