diff --git a/dbus-sdr/storagecommands.cpp b/dbus-sdr/storagecommands.cpp
index 4afeca4..bb0052f 100644
--- a/dbus-sdr/storagecommands.cpp
+++ b/dbus-sdr/storagecommands.cpp
@@ -35,6 +35,7 @@
 #include <fstream>
 #include <functional>
 #include <iostream>
+#include <optional>
 #include <stdexcept>
 #include <string_view>
 
@@ -80,6 +81,7 @@
 using ManagedObjectType =
     boost::container::flat_map<sdbusplus::message::object_path, ObjectType>;
 using ManagedEntry = std::pair<sdbusplus::message::object_path, ObjectType>;
+using Paths = std::vector<std::string>;
 
 constexpr static const char* fruDeviceServiceName =
     "xyz.openbmc_project.FruDevice";
@@ -586,72 +588,95 @@
         return IPMI_CC_RESPONSE_ERROR;
     }
     std::string name;
+    uint8_t entityID = 0;
+    uint8_t entityInstance = 0x1;
 
 #ifdef USING_ENTITY_MANAGER_DECORATORS
-
-    boost::container::flat_map<std::string, Value>* entityData = nullptr;
-
-    // todo: this should really use caching, this is a very inefficient lookup
     boost::system::error_code ec;
-    ManagedObjectType entities = ipmi::callDbusMethod<ManagedObjectType>(
-        ctx, ec, "xyz.openbmc_project.EntityManager",
-        "/xyz/openbmc_project/inventory", "org.freedesktop.DBus.ObjectManager",
-        "GetManagedObjects");
 
+    Paths subtreePaths = ipmi::callDbusMethod<Paths>(
+        ctx, ec, "xyz.openbmc_project.ObjectMapper",
+        "/xyz/openbmc_project/object_mapper",
+        "xyz.openbmc_project.ObjectMapper", "GetSubTreePaths",
+        "/xyz/openbmc_project/inventory", 0,
+        std::array<const char*, 2>{
+            "xyz.openbmc_project.Inventory.Decorator.I2CDevice",
+            "xyz.openbmc_project.Inventory.Decorator.Ipmi",
+        });
     if (ec)
     {
-        lg2::error("GetMangagedObjects for ipmiStorageGetFruInvAreaInfo "
-                   "failed: {ERROR}",
-                   "ERROR", ec.message());
-
+        lg2::error(
+            "GetSubTreePaths for ipmiStorageGetFruInvAreaInfo failed: {ERROR}",
+            "ERROR", ec.message());
         return ipmi::ccResponseError;
     }
 
-    auto entity = std::find_if(
-        entities.begin(), entities.end(),
-        [bus, address, &entityData, &name](ManagedEntry& entry) {
-            auto findFruDevice = entry.second.find(
-                "xyz.openbmc_project.Inventory.Decorator.I2CDevice");
-            if (findFruDevice == entry.second.end())
+    bool foundDevice = false;
+    for (const auto& path : subtreePaths)
+    {
+        ipmi::PropertyMap i2cProperties;
+        boost::system::error_code ec = ipmi::getAllDbusProperties(
+            ctx, "xyz.openbmc_project.EntityManager", path,
+            "xyz.openbmc_project.Inventory.Decorator.I2CDevice", i2cProperties);
+        if (ec)
+        {
+            continue;
+        }
+
+        std::optional<uint64_t> maybeBus;
+        std::optional<uint64_t> maybeAddress;
+        std::optional<std::string> maybeName;
+        for (const auto& [key, val] : i2cProperties)
+        {
+            if (key == "Bus")
             {
-                return false;
+                maybeBus = std::get<uint64_t>(val);
             }
-
-            // Integer fields added via Entity-Manager json are uint64_ts by
-            // default.
-            auto findBus = findFruDevice->second.find("Bus");
-            auto findAddress = findFruDevice->second.find("Address");
-
-            if (findBus == findFruDevice->second.end() ||
-                findAddress == findFruDevice->second.end())
+            else if (key == "Address")
             {
-                return false;
+                maybeAddress = std::get<uint64_t>(val);
             }
-            if ((std::get<uint64_t>(findBus->second) != bus) ||
-                (std::get<uint64_t>(findAddress->second) != address))
+            else if (key == "Name")
             {
-                return false;
+                maybeName = std::get<std::string>(val);
             }
+        }
+        if (!maybeBus || *maybeBus != bus || !maybeAddress ||
+            *maybeAddress != address)
+        {
+            continue;
+        }
+        // At this point we found the device entry and will populate the
+        // information if exist.
+        foundDevice = true;
 
-            auto fruName = findFruDevice->second.find("Name");
-            if (fruName != findFruDevice->second.end())
+        if (maybeName.has_value())
+        {
+            name = *maybeName;
+        }
+
+        ipmi::PropertyMap entityData;
+        ec = ipmi::getAllDbusProperties(
+            ctx, "xyz.openbmc_project.EntityManager", path,
+            "xyz.openbmc_project.Inventory.Decorator.Ipmi", entityData);
+        if (!ec)
+        {
+            for (const auto& [key, val] : entityData)
             {
-                name = std::get<std::string>(fruName->second);
+                if (key == "EntityId")
+                {
+                    entityID = std::get<uint64_t>(val);
+                }
+                else if (key == "EntityInstance")
+                {
+                    entityInstance = std::get<uint64_t>(val);
+                }
             }
+        }
+        break;
+    }
 
-            // At this point we found the device entry and should return
-            // true.
-            auto findIpmiDevice = entry.second.find(
-                "xyz.openbmc_project.Inventory.Decorator.Ipmi");
-            if (findIpmiDevice != entry.second.end())
-            {
-                entityData = &(findIpmiDevice->second);
-            }
-
-            return true;
-        });
-
-    if (entity == entities.end())
+    if (!foundDevice)
     {
         if constexpr (DEBUG)
         {
@@ -659,7 +684,6 @@
                                  "not found for Fru\n");
         }
     }
-
 #endif
 
     std::vector<std::string> nameProperties = {
@@ -700,28 +724,6 @@
     resp.body.deviceType = 0x10;
     resp.body.deviceTypeModifier = 0x0;
 
-    uint8_t entityID = 0;
-    uint8_t entityInstance = 0x1;
-
-#ifdef USING_ENTITY_MANAGER_DECORATORS
-    if (entityData)
-    {
-        auto entityIdProperty = entityData->find("EntityId");
-        auto entityInstanceProperty = entityData->find("EntityInstance");
-
-        if (entityIdProperty != entityData->end())
-        {
-            entityID = static_cast<uint8_t>(
-                std::get<uint64_t>(entityIdProperty->second));
-        }
-        if (entityInstanceProperty != entityData->end())
-        {
-            entityInstance = static_cast<uint8_t>(
-                std::get<uint64_t>(entityInstanceProperty->second));
-        }
-    }
-#endif
-
     resp.body.entityID = entityID;
     resp.body.entityInstance = entityInstance;