Throw out all the logical APIC ID stuff and just wire up the interrupts to individual CPUs using physical addressing and fixed delivery mode.