diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
index c70befa4d9a8ef021d3ff23a321e4f5ffe96e999..9a986c4ea92eb9284f00ce9957c3de0e0bb1bfc1 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/InDetJiveXML/PixelRDORetriever.h
@@ -12,6 +12,8 @@
 #include "InDetReadoutGeometry/SiDetectorElementCollection.h"
 #include "StoreGate/ReadCondHandleKey.h"
 
+class PixelID;
+
 namespace JiveXML {
   
   /**
@@ -49,9 +51,7 @@ namespace JiveXML {
       ///The data type that is generated by this retriever
       const std::string m_typeName;
 
-      /// A tool handle to the geo model tool
-      const ToolHandle<IInDetGeoModelTool> m_geo
-         {this,"GeoModelTool", "JiveXML::InDetGeoModelTool/InDetGeoModelTool","" };
+      const PixelID* m_pixelID{nullptr};
 
       /// A tool handle to the SiLorentzAngleTool
       ToolHandle<ISiLorentzAngleTool> m_lorentzAngleTool{this, "LorentzAngleTool", "SiLorentzAngleTool/SCTLorentzAngleTool", "Tool to retreive Lorentz angle"};
diff --git a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
index 9e2681bbabeaa0611bb4f47c15fcacf21fecf71a..a7cc8dfc1ce67bfca060b55fcf2cd52b4915076c 100755
--- a/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
+++ b/InnerDetector/InDetEventCnv/InDetJiveXML/src/PixelRDORetriever.cxx
@@ -75,7 +75,8 @@ namespace JiveXML {
         //Get the pixel identifier
         const PixelRDORawData *rdoData = *collectionItr;
         const Identifier id = rdoData->identify();
-        IdentifierHash wafer_hash = m_geo->PixelIDHelper()->wafer_hash(id);
+        const Identifier waferID = m_pixelID->wafer_id(id);
+        IdentifierHash wafer_hash = m_pixelID->wafer_hash(waferID);
 
         //Get the detector element
         const InDetDD::SiDetectorElement *element = elements->getDetectorElement(wafer_hash);
@@ -96,8 +97,8 @@ namespace JiveXML {
         xVec.push_back(DataType(globalPos.x()*CLHEP::mm/CLHEP::cm));
         yVec.push_back(DataType(globalPos.y()*CLHEP::mm/CLHEP::cm));
         zVec.push_back(DataType(globalPos.z()*CLHEP::mm/CLHEP::cm));
-        phiModuleVec.push_back(DataType(m_geo->PixelIDHelper()->phi_module(id)));
-        etaModuleVec.push_back(DataType(m_geo->PixelIDHelper()->eta_module(id)));
+        phiModuleVec.push_back(DataType(m_pixelID->phi_module(waferID)));
+        etaModuleVec.push_back(DataType(m_pixelID->eta_module(waferID)));
       }
     }
 
@@ -131,7 +132,8 @@ namespace JiveXML {
   StatusCode PixelRDORetriever::initialize() {
     ATH_CHECK( m_lorentzAngleTool.retrieve() );
     ATH_CHECK(m_pixelDetEleCollKey.initialize());
+    ATH_CHECK(detStore()->retrieve(m_pixelID,"PixelID"));
 
-    return m_geo.retrieve();
+    return StatusCode::SUCCESS;
   }
 }