diff --git a/api/services/jsorg/[query].ts b/api/services/jsorg/[query].ts
index 3a53ebf..f9fa7c6 100644
--- a/api/services/jsorg/[query].ts
+++ b/api/services/jsorg/[query].ts
@@ -1,9 +1,10 @@
-import { send, sendError, fetch } from '../../../util/http';
-import { NowRequest, NowResponse } from '@vercel/node';
+import { VercelRequest, VercelResponse } from '@vercel/node';
+import { VM } from 'vm2';
+import { fetch, send, sendError } from '../../../util/http';
 
 export default async function handler(
-  req: NowRequest,
-  res: NowResponse
+  req: VercelRequest,
+  res: VercelResponse
 ): Promise<void> {
   const { query } = req.query;
 
@@ -15,18 +16,24 @@ export default async function handler(
     return sendError(res, new Error('Invalid format'));
   }
 
+  const cname = query.replace(/\.js\.org$/, '');
+
   try {
-    // Get js.org domain data from js.org.json repo
-    const domains = await fetch(
-      `https://raw.githubusercontent.com/raikasdev/js.org.json/master/output/subdomains_registered.min.json`,
+    // Get cnames from js.org repo
+    const source = await fetch(
+      `https://raw.githubusercontent.com/js-org/js.org/master/cnames_active.js`,
       'GET'
-    ).then((res) => res.json());
-    if (domains.includes(query)) {
+    ).then((res) => res.text());
+    const vm = new VM();
+    vm.run(source);
+    const cnames = Object.keys(vm.sandbox.cnames_active);
+
+    if (cnames.includes(cname)) {
       send(res, { availability: false });
     } else {
       send(res, { availability: true });
     }
   } catch (err) {
-    sendError(res, err);
+    sendError(res, err as any);
   }
 }
diff --git a/package.json b/package.json
index 366bf39..41909ee 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "styled-components": "^5.3.1",
     "swr": "^1.0.1",
     "validator": "^13.6.0",
+    "vm2": "^3.9.5",
     "whois-json": "^2.0.4"
   },
   "devDependencies": {
diff --git a/util/http.ts b/util/http.ts
index 90aac2c..282631e 100644
--- a/util/http.ts
+++ b/util/http.ts
@@ -1,4 +1,4 @@
-import { NowResponse } from '@vercel/node';
+import { VercelResponse } from '@vercel/node';
 import nodeFetch from 'cross-fetch';
 
 export type HttpMethod =
@@ -16,15 +16,15 @@ export function fetch(
   method: HttpMethod = 'HEAD'
 ): Promise<Response> {
   return nodeFetch(url, {
-    method: method,
+    method,
   });
 }
 
-export function send(res: NowResponse, data: object): void {
+export function send(res: VercelResponse, data: object): void {
   res.setHeader('Cache-Control', 's-maxage=86400');
   res.json(data);
 }
 
-export function sendError(res: NowResponse, error: Error): void {
+export function sendError(res: VercelResponse, error: Error): void {
   res.status(400).json({ error: error.message });
 }
diff --git a/yarn.lock b/yarn.lock
index 3295886..24aceba 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12748,6 +12748,11 @@ vm-browserify@^1.0.1:
   resolved "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
   integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
 
+vm2@^3.9.5:
+  version "3.9.5"
+  resolved "https://registry.npmjs.org/vm2/-/vm2-3.9.5.tgz#5288044860b4bbace443101fcd3bddb2a0aa2496"
+  integrity sha512-LuCAHZN75H9tdrAiLFf030oW7nJV5xwNMuk1ymOZwopmuK3d2H4L1Kv4+GFHgarKiLfXXLFU+7LDABHnwOkWng==
+
 void-elements@3.1.0:
   version "3.1.0"
   resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"