diff --git a/packages/xo-cli/package.json b/packages/xo-cli/package.json
index 532df7ca0..d117afcf6 100644
--- a/packages/xo-cli/package.json
+++ b/packages/xo-cli/package.json
@@ -31,8 +31,8 @@
     "lodash": "^2.4.1",
     "mkdirp": "^0.5.0",
     "multiline": "^0.3.4",
-    "ws": "^0.4.31",
-    "xdg": "^0.1.1"
+    "xdg": "^0.1.1",
+    "xo-lib": "^0.1.0"
   },
   "devDependencies": {
     "chai": "^1.9.1",
diff --git a/packages/xo-cli/src/cli.js b/packages/xo-cli/src/cli.js
index 28b00869f..6fa4377f4 100644
--- a/packages/xo-cli/src/cli.js
+++ b/packages/xo-cli/src/cli.js
@@ -6,12 +6,12 @@ var _ = require('lodash');
 var Promise = require('bluebird');
 var multiline = require('multiline');
 var chalk = require('chalk');
+var Xo = require('xo-lib');
 
 //--------------------------------------------------------------------
 
 var config = require('./config');
 var prompt = require('./prompt');
-var Xo = require('./xo');
 
 //====================================================================
 
diff --git a/packages/xo-cli/src/xo.js b/packages/xo-cli/src/xo.js
deleted file mode 100644
index 678a68689..000000000
--- a/packages/xo-cli/src/xo.js
+++ /dev/null
@@ -1,150 +0,0 @@
-'use strict';
-
-//====================================================================
-
-var _ = require('lodash');
-
-var Promise = require('bluebird');
-
-// Supports browsers.
-// FIXME: wraps in an anonymous function.
-// jshint ignore: start
-var WebSocket = (this && 'WebSocket' in this) ? this.WebSocket : require('ws');
-// jshint ignore: end
-
-//====================================================================
-
-var notConnected = function () {
-  throw new Error('not connected');
-};
-
-//====================================================================
-
-var Xo = function (url) {
-  this._url = url;
-
-  // Identifier of the next request.
-  this._nextId = 0;
-
-  // Promises linked to the requests.
-  this._deferreds = {};
-
-  // Current WebSocket.
-  this._socket = null;
-
-  // Current status which may be:
-  // - disconnected
-  // - connecting
-  // - connected
-  this.status = 'disconnected';
-};
-
-_.extend(Xo.prototype, {
-  close: function () {
-    if (this._socket)
-    {
-      this._socket.close();
-    }
-  },
-
-  connect: function () {
-    if (this.status === 'connected')
-    {
-      return Promise.cast();
-    }
-
-    var deferred = Promise.defer();
-
-    this.status = 'connecting';
-
-    var socket = this._socket = new WebSocket(this._url);
-
-    // When the socket opens, send any queued requests.
-    socket.on('open', function () {
-      this.status = 'connected';
-
-      // (Re)Opens accesses.
-      delete this.send;
-
-      // Resolves the promise.
-      deferred.resolve();
-    }.bind(this));
-
-    socket.on('message', function (data) {
-      // `ws` API is lightly different from standard API.
-      if (data.data)
-      {
-        data = data.data;
-      }
-
-      // TODO: Wraps in a promise to prevent releasing the Zalgo.
-      var response = JSON.parse(data);
-
-      var id = response.id;
-
-      var deferred = this._deferreds[id];
-      if (!deferred)
-      {
-        // Response already handled.
-        return;
-      }
-      delete this._deferreds[id];
-
-      if ('error' in response)
-      {
-        return deferred.reject(response.error);
-      }
-
-      if ('result' in response)
-      {
-        return deferred.resolve(response.result);
-      }
-
-      deferred.reject({
-        message: 'invalid response received',
-        object: response,
-      });
-    }.bind(this));
-
-    socket.on('close', function () {
-      // Closes accesses.
-      this.send = notConnected;
-
-      // Fails all waiting requests.
-      _.each(this._deferreds, function (deferred) {
-        deferred.reject('not connected');
-      });
-      this._deferreds = {};
-    }.bind(this));
-
-    socket.on('error', function (error) {
-      // Fails the connect promise if possible.
-      deferred.reject(error);
-    });
-
-    return deferred.promise;
-  },
-
-  call: function (method, params) {
-    return this.connect().then(function () {
-      var socket = this._socket;
-
-      var id = this._nextId++;
-
-      socket.send(JSON.stringify({
-        jsonrpc: '2.0',
-        id: id,
-        method: method,
-        params: params || [],
-      }));
-
-      var deferred = this._deferreds[id] = Promise.defer();
-
-      return deferred.promise;
-    }.bind(this));
-  },
-});
-
-//====================================================================
-
-module.exports = Xo;