Use find_by_* in some places. Sssh, it's okay. It's not actually deprecated.

Signed-off-by: David Celis <me@davidcel.is>