Cleaned up idle logic in _object_lookup and _save_object