diff --git a/src/applications/search/controller/PhabricatorSearchSelectController.php b/src/applications/search/controller/PhabricatorSearchSelectController.php
index cf0f4e1aa0..f0345d2b7d 100644
--- a/src/applications/search/controller/PhabricatorSearchSelectController.php
+++ b/src/applications/search/controller/PhabricatorSearchSelectController.php
@@ -1,118 +1,76 @@
 <?php
 
 /**
  * @group search
  */
 final class PhabricatorSearchSelectController
   extends PhabricatorSearchBaseController {
 
   private $type;
 
   public function willProcessRequest(array $data) {
     $this->type = $data['type'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $user = $request->getUser();
 
     $query = new PhabricatorSearchQuery();
     $query_str = $request->getStr('query');
 
     $query->setQuery($query_str);
     $query->setParameter('type', $this->type);
 
     switch ($request->getStr('filter')) {
       case 'assigned':
         $query->setParameter('owner', array($user->getPHID()));
         $query->setParameter('open', 1);
         break;
       case 'created';
         $query->setParameter('author', array($user->getPHID()));
         // TODO - if / when we allow pholio mocks to be archived, etc
         // update this
         if ($this->type != PholioPHIDTypeMock::TYPECONST) {
           $query->setParameter('open', 1);
         }
         break;
       case 'open':
         $query->setParameter('open', 1);
         break;
     }
 
     $query->setParameter('exclude', $request->getStr('exclude'));
     $query->setParameter('limit', 100);
 
     $engine = PhabricatorSearchEngineSelector::newSelector()->newEngine();
     $results = $engine->executeSearch($query);
 
     $phids = array_fill_keys($results, true);
     $phids += $this->queryObjectNames($query_str);
 
     $phids = array_keys($phids);
     $handles = $this->loadViewerHandles($phids);
 
     $data = array();
     foreach ($handles as $handle) {
       $view = new PhabricatorHandleObjectSelectorDataView($handle);
       $data[] = $view->renderData();
     }
 
     return id(new AphrontAjaxResponse())->setContent($data);
   }
 
   private function queryObjectNames($query) {
+    $viewer = $this->getRequest()->getUser();
 
-    $pattern = null;
-    switch ($this->type) {
-      case ManiphestPHIDTypeTask::TYPECONST:
-        $pattern = '/\bT(\d+)\b/i';
-        break;
-      case DifferentialPHIDTypeRevision::TYPECONST:
-        $pattern = '/\bD(\d+)\b/i';
-        break;
-      case PholioPHIDTypeMock::TYPECONST:
-        $pattern = '/\bM(\d+)\b/i';
-        break;
-    }
-
-    if (!$pattern) {
-      return array();
-    }
-
-    $matches = array();
-    preg_match_all($pattern, $query, $matches);
-    if (!$matches) {
-      return array();
-    }
-
-    $object_ids = $matches[1];
-    if (!$object_ids) {
-      return array();
-    }
-
-    switch ($this->type) {
-      case DifferentialPHIDTypeRevision::TYPECONST:
-        // TODO: (T603) See below. This whole thing needs cleanup.
-        $objects = id(new DifferentialRevision())->loadAllWhere(
-          'id IN (%Ld)',
-          $object_ids);
-        break;
-      case ManiphestPHIDTypeTask::TYPECONST:
-        // TODO: (T603) Clean this up. This should probably all run through
-        // ObjectQuery?
-        $objects = id(new ManiphestTask())->loadAllWhere(
-          'id IN (%Ld)',
-          $object_ids);
-        break;
-      case PholioPHIDTypeMock::TYPECONST:
-        $objects = id(new PholioMock())->loadAllWhere(
-          'id IN (%Ld)',
-          $object_ids);
-        break;
-    }
+    $objects = id(new PhabricatorObjectQuery())
+      ->setViewer($viewer)
+      ->withTypes(array($this->type))
+      ->withNames(array($query))
+      ->execute();
 
-    return array_fill_keys(mpull($objects, 'getPHID'), true);
+    return mpull($objects, 'getPHID');
   }
 
 }