The quark-delocalization, color-screening model (QDCSM), extended by inclusion of a one-pion-exchange (OPE) tail, is applied to the study of the deuteron and the d * dibaryon. The results show that the properties of the deuteron (an extended object) are well reproduced, greatly improving the agreement with experimental data as compared to our previous study (without OPE). At the same time, the mass and decay width of the d * (a compact object) are, as expected, not altered significantly.