XJ intermediate shaft is way too short and has double D end on the column side, CJ has splined.
Depending on how rusted together your shaft is, you should be able to slide it out enough to work with the body lift. Maybe an inch. You will have to remove the intermediate shaft to lengthen it.
The "pins" aren't exactly "pins" as much as they are injection points for the plastic that is injected into the shaft to keep it at a certain length when manufactured and still allow it to collapse (slide) when needed.
Here you can barely see the 2 "pins".
With the pins drilled though to the inner shaft, you then slide (with the help of a BFH and a piece of steel or hard wood)
Here is what it looks like with the upper almost completely removed ( you shouldn't have to move yours this far) Note that the inside (solid) shaft has two squares machined out to allow for the injected plastic (it's acutally more like a nylon)
Somebody got a little carried away with the plastic on this one.
If you end up going with a Flaming River intermediate shaft, might as well order it with a double D top and drop in an XJ tilt column. Then you can use the brights on the column and wiper switch on the column like newer vehicles. Or find a YJ upper intermediate shaft and mate it to your CJ lower and add the XJ column.