diff --git a/core/lib/Drupal/Core/Config/Entity/Query/Query.php b/core/lib/Drupal/Core/Config/Entity/Query/Query.php
index 5782503..ed3271a 100644
--- a/core/lib/Drupal/Core/Config/Entity/Query/Query.php
+++ b/core/lib/Drupal/Core/Config/Entity/Query/Query.php
@@ -125,7 +125,7 @@ public function execute() {
    */
   protected function loadRecords() {
     $entity_info = $this->entityManager->getDefinition($this->getEntityType());
-    $prefix = $entity_info['config_prefix'] . '.';
+    $prefix = $entity_info->getConfigPrefix() . '.';
     $prefix_length = strlen($prefix);
 
     // If there are conditions on the config ID, we can narrow the list of
@@ -133,7 +133,7 @@ protected function loadRecords() {
     $ids = array();
     if ($this->condition->getConjunction() == 'AND') {
       foreach ($this->condition->conditions() as $condition) {
-        if ($condition['field'] == $entity_info['entity_keys']['id']) {
+        if ($condition['field'] == $entity_info->getKey('id')) {
           $operator = $condition['operator'];
           if (!isset($condition['operator'])) {
             $operator = is_array($condition['value']) ? 'IN' : '=';