Move x86 check to external file