Add primary key to ->find calls where possible