diff --git a/src/core/components/id.js b/src/core/components/id.js
index a8fd75f92d..f848d96e8f 100644
--- a/src/core/components/id.js
+++ b/src/core/components/id.js
@@ -1,14 +1,13 @@
 'use strict'
 
-const callbackify = require('callbackify')
 const pkgversion = require('../../../package.json').version
 
-module.exports = function id (self) {
-  return callbackify(async () => { // eslint-disable-line require-await
+module.exports = ({ peerInfo }) => {
+  return async function id () { // eslint-disable-line require-await
     return {
-      id: self._peerInfo.id.toB58String(),
-      publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'),
-      addresses: self._peerInfo.multiaddrs
+      id: peerInfo.id.toB58String(),
+      publicKey: peerInfo.id.pubKey.bytes.toString('base64'),
+      addresses: peerInfo.multiaddrs
         .toArray()
         .map((ma) => ma.toString())
         .filter((ma) => ma.indexOf('ipfs') >= 0)
@@ -16,5 +15,5 @@ module.exports = function id (self) {
       agentVersion: `js-ipfs/${pkgversion}`,
       protocolVersion: '9000'
     }
-  })
+  }
 }
diff --git a/src/core/components/index.js b/src/core/components/index.js
index 44d922712a..2a16181669 100644
--- a/src/core/components/index.js
+++ b/src/core/components/index.js
@@ -2,6 +2,7 @@
 
 exports.add = require('./add')
 exports.config = require('./config')
+exports.id = require('./id')
 exports.init = require('./init')
 exports.start = require('./start')
 exports.stop = require('./stop')
diff --git a/src/core/components/init.js b/src/core/components/init.js
index 089d6148dc..09201762d9 100644
--- a/src/core/components/init.js
+++ b/src/core/components/init.js
@@ -300,6 +300,7 @@ function createApi ({
   const api = {
     add,
     config: Commands.config({ repo }),
+    id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },
     start
   }
diff --git a/src/core/components/start.js b/src/core/components/start.js
index f9f41c7458..d740682ad4 100644
--- a/src/core/components/start.js
+++ b/src/core/components/start.js
@@ -132,6 +132,7 @@ function createApi ({
   const api = {
     add,
     config: Commands.config({ repo }),
+    id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },
     start: () => apiManager.api,
     stop
diff --git a/src/core/components/stop.js b/src/core/components/stop.js
index 4e2a9bb036..5e48a9cb1d 100644
--- a/src/core/components/stop.js
+++ b/src/core/components/stop.js
@@ -99,6 +99,7 @@ function createApi ({
   const api = {
     add,
     config: Commands.config({ repo }),
+    id: Commands.id({ peerInfo }),
     init: () => { throw new AlreadyInitializedError() },
     start,
     stop: () => apiManager.api