The previous commit solved the 'related fields' problem but not the get_object_or_404 one. This commit does.